Yep
Merge branch 'develop' of https://github.com/figa12/sw606f13.git into develop
Merge branch 'develop' of https://github.com/figa12/sw606f13.git into
develop

Conflicts:
	source/Train/res/layout/activity_profile.xml
Starten af et OpenGL projekt forsøg
animation project
Changed image size
Skulle være simpelt fungerende OpenGL kode, men kan kun testet på en
rigtig tablet, activity_game melder dog nogle xml fejl
det virker!
Merge branch 'develop' of https://github.com/figa12/sw606f13.git into
develop-OpenGL

Conflicts:
	source/Train/res/layout/activity_game.xml
refactoring all over, done
Merge branch 'master' into develop