Updated Gemfile
Updated Gemfile
Fixed gemfile and added gemfile.lock to gitignore
Merged master
Merge branch 'master' of https://github.com/jhulley/sundayadventure
fixed alert warning success bug, changed text for different platforms
merged master
Merge pull request #7 from jhulley/prelim_layout

fixed alert warning success bug, changed text for different platforms