first commit
.gitignore is now working
Merge https://github.com/fredpaw/gianthouse

Conflicts:
	.gitignore