no message
Merge branch 'master' of https://github.com/lnolson/snapp

Conflicts:
	app/views/users/index.html.erb
Merge pull request #52 from jacarpe5/master

Add Group New & Edit form and views