Final story until boss
Merge branch 'master' of https://github.com/hpimentel/game215

Conflicts:
	project215/mainwindow.cpp
more