re-initialized base
cleared out garbage in preparation for the final update
Merge branch 'master' of github.com:mladoux/brainFART

Conflicts:
	.floo
	app/config/app.php
	app/models/User.php
	app/start/global.php