button switcharoo
Merge branch 'Angular' of https://github.com/familiar-studio/Familiar into Angular

Conflicts:
	public/scripts/main.min.js
	public/styles/familiar.css