post-merge fixes #7
Merge branch 'master' of https://github.com/scarpazi/oa2_v0

Conflicts:
	.gitignore
post-merge fixes #8