diff --git a/app/views/music1.twig b/app/views/music1.twig
index d9fea54..ca826be 100644
--- a/app/views/music1.twig
+++ b/app/views/music1.twig
@@ -1,7 +1,6 @@
{% extends 'templates/default.twig' %}
{% block javascripts %}
-
{% endblock %}
diff --git a/app/views/music2.twig b/app/views/music2.twig
index 52b6eb2..3630acd 100644
--- a/app/views/music2.twig
+++ b/app/views/music2.twig
@@ -1,7 +1,6 @@
{% extends 'templates/default.twig' %}
{% block javascripts %}
-
{% endblock %}
diff --git a/app/views/templates/default.twig b/app/views/templates/default.twig
index 7f94ac9..7e774fc 100755
--- a/app/views/templates/default.twig
+++ b/app/views/templates/default.twig
@@ -1,28 +1,30 @@
-
-
-
- {% block title %}{% endblock %} | Halftone
-
+
+
+
+ {% block title %}{% endblock %} | Halftone
+
+
- {% block stylesheets %}{% endblock %}
-
+ {% block stylesheets %}{% endblock %}
+
-
- {% block javascripts %}{% endblock %}
+
+
+ {% block javascripts %}{% endblock %}
-
-
- {% include 'templates/partials/header.twig' %}
+
+
+ {% include 'templates/partials/header.twig' %}
- {% block content %}{% endblock %}
-
-
+ {% block content %}{% endblock %}
+
+
- {% include 'templates/partials/footer.twig' %}
+ {% include 'templates/partials/footer.twig' %}
diff --git a/public/js/music.js b/public/js/music.js
index 2631b8d..c9d8809 100755
--- a/public/js/music.js
+++ b/public/js/music.js
@@ -1,7 +1,26 @@
$(document).ready(function() {
- $('#music-player').musicPlayer({
- 'audio': '#music-player',
- 'volume': .5,
- 'startTime': 0
- })
-});
\ No newline at end of file
+ var player = new MediaElementPlayer('#music-player', {
+ // initial volume when the player starts
+ startVolume: 0.5,
+ // useful for player loops
+ loop: false,
+ // enables Flash and Silverlight to resize to content size
+ enableAutosize: true,
+ // the order of controls you want on the control bar (and other plugins below)
+ features: ['playpause','progress','current','duration','tracks','volume'],
+ // Hide controls when playing and mouse is not over the video
+ alwaysShowControls: false,
+ // force iPad's native controls
+ iPadUseNativeControls: false,
+ // force iPhone's native controls
+ iPhoneUseNativeControls: false,
+ // force Android's native controls
+ AndroidUseNativeControls: false,
+ // forces the hour marker (##:00:00)
+ alwaysShowHours: false,
+ // turns keyboard support on and off for this instance
+ enableKeyboard: true,
+ // when this player starts, it will pause other players
+ pauseOtherPlayers: true
+ });
+});