working on all
Merge branch 'master' of https://github.com/minionsmyl/minions

Conflicts:
	minions/app/controllers/pages_controller.rb
	minions/config/routes.rb