crap
Merge branch 'master' of https://github.com/pwcremin/3Best

Conflicts:
	app/.idea/workspace.xml
bootstrap redo