updated ignore file as Mac litters everywhere with DS_store
Merge branch 'master' of github.com:stephcook22/chula

Conflicts:
	.gitignore