Removed user_helper.rb
Merging to find conflicts
Merge branch 'master' of https://github.com/nickmeehan/abooty into layout_fixes
Name change of user_helper file
Merge pull request #31 from nickmeehan/layout_fixes

Layout fixes