hihi
creategame
Merge branch 'master' into super_awesome_justforscreenshotbranch
added manage and included it
added new screenshots and modified oad2.tex
Merge branch 'master' of https://github.com/franco11/OAD
added last screenshot
manually Merge branch 'super_awesome_justforscreenshotbranch'

Conflicts:
	LATEX/oad2.tex