Fixed test error, aboot to aboots, making it plural to match post route in controller
Added global feed and favorites feed
Merge pull request #29 from nickmeehan/layout_fixes

Layout fixes
Merge conflict in Nav
Added current user's aboots to personal feed
Merge pull request #30 from nickmeehan/favourite_list

Could automatically merge this pull request.
Merge pull request #28 from nickmeehan/followers

Tests!
Merging to find conflicts
Merge branch 'master' of https://github.com/nickmeehan/abooty into layout_fixes
Name change of user_helper file