this is my gitignore
resolved conflict kronda's changes
added photo and last name
Merge pull request #29 from TheLady/gh-pages

Right on!