Merge branches 'master' and 'dev' into dev
Fixes the nav bug
Added a <hr /> elemenet between news in index page
Navbar fix
manage users fix
manage users fix for real
Merge branch 'master', remote-tracking branch 'origin/master' into dev
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' of github.com:CodemonkeyTim/Pelicans2k into dev
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'dev' of github.com:CodemonkeyTim/Pelicans2k into dev
Merge branch 'dev' of github.com:CodemonkeyTim/Pelicans2k into dev
Merge branch 'dev' of github.com:CodemonkeyTim/Pelicans2k into dev
Latest stoof
Merge branch 'dev', remote-tracking branch 'origin/dev' into dev
Merge branch 'master', remote-tracking branch 'origin/master' into dev
Team.find(id).name fix
Merge branches 'master' and 'dev'