testing
Merge branch 'testing' into integration
Removed testing from integration
Merge branch 'master' into integration
added a demo file
hello from saeed
Merge remote-tracking branch 'origin' into integration
Merge branch 'integration' of https://github.com/theolind/mahm3lib into integration
test 1 2 3
derp
new message
afef
added derp.txt
Merge branch 'whateverfeature' into integration
Removed demo files
added .localized in .gitignore
test

Conflicts:
	a-text-file.txt
deleted testfile
Added the initial project, with unity and a test
Merge branch 'integration' into projectsetup