attempting to solve platform speed issue
Merge branch 'master' into dev_nick
Merge branch 'master' into dev_nick
Add gems
discarded some unnecessary gems
deleting user feedback/altering facebook placement
fixing merge conflicts to get merge back to master branch
fixing yield issue
adding yield
getting rid of user feedback