renamed output files and changed build scripts
Merge branch 'master' of https://github.com/MikkoFinell/BattleArena

Conflicts:
	bin/run.bash
	testing/bin/run.bash