test
Merge branch 'master' of https://github.com/figa12/sw606f13.git
Train illustrator file added :)
Merge branch 'develop'

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

Conflicts:
	source/Train/res/layout/activity_profile.xml