alright
Merge branch 'master' of github.com:neonankiti/Shotoku

Conflicts:
	css/user/base.css