Changed icon resolution
Merge branch 'Prototype-B---Shun'
Merge branch 'master' of https://github.com/redien/flighty