Merge branch 'master' of https://github.com/jpavley/himins

Conflicts:
	.DS_Store
updated git ignore!
gerrr
git ignore