wut

Signed-off-by: Travis Hairfield <twh116@gmail.com>
Cosmetic upgrades and jplayer slave players

Signed-off-by: Travis Hairfield <twh116@gmail.com>
Merge branch 'refs/heads/Project_page'

Signed-off-by: Travis Hairfield <twh116@gmail.com>

Conflicts:
	views/project.jade
Fixed it

Signed-off-by: Travis Hairfield <twh116@gmail.com>
Merge branch 'master' of https://github.com/idolize/musicapp

Signed-off-by: Travis Hairfield <twh116@gmail.com>

Conflicts:
	public/css/style.css
	views/layout.jade