Tweaked styles
Merge branch 'master' of github.com:rpayne1530/DragonballDD

Conflicts:
	app/css/app.css