Merge branch 'master' into gh-pages
Comment to detect server
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Gulp task to update tracklist
Remove parser folder
Remove rake file
Clean up gulpfile
Update angular and fix gulp task
Reorganizing
Merge branch 'master' of github.com:jxnblk/Microbeats

Conflicts:
	index.html
	js/services.js