Merge branch 'new_style'

Conflicts:
	views/user/show.ejs
Merge branch 'master' of github.com:shukbot/inspiral

Conflicts:
	views/user/show.ejs