Merge pull request #33 from melodyserra/master

Cleaned up GIT and removed .DS_Store