Cleaned model and controller a bit more
Merge branch 'overlord2/mabdeljalil' of https://github.com/msabdeljalil/level_up_exercises into overlord2/mabdeljalil

Conflicts:
	overlord/lib/overlord.rb