Merge branch 'master' of https://github.com/12sm/chuckwicks

Conflicts:
	assets/css/app.css
?
Merge branch 'master' of https://github.com/12sm/chuckwicks

Conflicts:
	assets/css/app.css