made a change
other changes on master
Story 53: Makefile added
hotfix fixed main.h
Makefile done
Merge branch 'story53'
mergetest
mastertest
Merge branch 'mergetest'

Conflicts:
	main.cpp
Merge branch 'testing'

Conflicts:
	main.cpp