git ignore
Merge branch 'master' of github.com:alotofdavid/whos-there