Merge pull request #2 from c-meek/master

Added iOS information
Merge pull request #3 from c-meek/master

Added sources for iOS
Added navigation for resources page
hybrid stuff
Merge pull request #4 from breanneee/master

hybrid stuff
hybrid pictures
Merge pull request #5 from breanneee/master

hybrid pictures
final touches, ready to go live
Changed picture extensions
Merge pull request #2 from BrettKoenig/master

pulling in the hybrid stuff