Updates
Merge branch 'master' of https://github.com/joelfoy/bartik

Conflicts:
	razzle.info