removed guard helpers from gemfile
Merge branch 'develop' of https://github.com/fairnopoly/fairnopoly into develop
Gemfile.lock
merged Gemfile.lock
Gemfile.lock
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
welcome header of boxes turned to links
resolved merge conflict in welcome/index.html.haml
Merge branch 'develop' of github.com:fairnopoly/fairnopoly into develop
fixed #854 for develop