stylesheet1:
Merge branch 'master' of github.com:kelvinw88/CrunkBox

Conflicts:
	app/views/index.erb
	app/views/layout.erb
Merge branch 'master' of github.com:kelvinw88/CrunkBox
ignore the db