Changed git ignore
modified git ignore
iphone icon added
merge fix
Merge pull request #60 from Bkahler/master

Added iphone icon thing,