First commit
Merge branch 'master' of https://github.com/atk91/gas2

Conflicts:
	.gitignore