Launchfiler
Merge branch 'master' of https://github.com/ostagarn/archack2014.git

Conflicts:
	.gitignore