This is a commit from test2 branch
Merge branch 'master' into test2

Conflicts:
	app/views/users/index.html.erb
Merge pull request #5 from prawl/test2

This is a commit from test2 branch