inital commit
Merge branch 'master' of github.com:droghetti/inishal

Conflicts:
	.gitignore