syntax
Merge branch 'master' of https://github.com/juliaoh/fruitfulminds

Conflicts:
	app/views/users/all_users.html.haml