yay
Merge branch 'master' of https://github.com/nivram80/the-nag
test
Merge branch 'master' of https://github.com/nivram80/the-nag

Conflicts:
	config/routes.rb