Merge pull request #1 from prawl/test

Added cool header
Merge pull request #3 from prawl/test

Added a second header
Commit from test branch 1
Merge pull request #4 from prawl/test

Commit from test branch 1
Merge branch 'master' into test2

Conflicts:
	app/views/users/index.html.erb