Merge pull request #4 from carmelatortoza/carmi

Carmi
something
breakpoints
sadfasdf

d
asf
Revert "sadfasdf"

This reverts commit df0ab8b8fa525c0aeaecdccba768f7b07deb066d.
a
gitignore
revert
Repo Fix
Added some comments on code and fixed spacing.
Update to xcode 4.6, Changed and fixed deprecated methods
Merged master branch from JM's repo