What'S UP DOG!?
.gitignore updated med .tmp
lal
Merge branch 'develop' of https://github.com/figa12/sw606f13.git into develop
Merge branch 'develop'

Conflicts:
	source/Train/res/layout/activity_profile.xml
Merge branch 'master' of https://github.com/figa12/sw606f13.git