Merge branch 'master' of https://github.com/lorixx/ironman

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/lorixx/ironman