Changed paths
Merge remote-tracking branch 'origin/master'

Conflicts:
	Handin02/Handin02_grp11662/.idea/gradle.xml
	Handin02/Handin02_grp11662/.idea/workspace.xml
	Handin02/Handin02_grp11662/Handin02_grp11662.iml
	Handin02/Handin02_grp11662/app/app.iml
workspace.xml