Initial commit
Removed .DS_Store
Updated app icon and removed file that shouldn't be tracked
Updated for Swift Beta 7
Update gitignore
Fixed merge conflict
Merge pull request #1 from CosmicByte/develop

Develop