Finished controller and model tests
got rid of pending tests
got rid of pending tests
Merge branch 'soutchay' into mike
put navbar from bottom to top
Merge branch 'mike' into soutchay
add  rails12 gem for heroku