Some stizyling
Merge branch 'ericstyling'

Conflicts:
	app/assets/javascripts/main.js
Styling and adjusted some dom stuffs
passing through style town
Merge branch 'master' of github.com:csb324/getdated
Merge branch 'stizyling'