changed .gitignore to ignore a couple things including .orig files coming from mergetool
cleaner .gitignore
fixed some alignment and sizing bugs for iPhone for issue #39
Merge pull request #41 from individual11/master

iphone alignment and sizing for issue #39