Merge pull request #140 from ammoio/dev

Version 0.1
fixed body padding css
fixed whitespace
Merge branch 'dbfix' into dev

Conflicts:
	public/scripts/services/queue.js
Merge pull request #197 from nickescallon/paintjob

Initial refactor of index.html
begin refactor of UI
Merge branch 'viewcss' into queue
added bottom padding in page-content
Merge pull request #199 from alexmckenley/css

adding bottom padding and queue.html
page no longer in spanish, added player functionality