merge shit
Merge branch 'master' of https://github.com/alexandru-paduraru/razaboi

Conflicts:
	log/development.log