Merge pull request #13 from meidlin/soutchay

Soutchay
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
added click function to images in carousel
Merge branch 'mike' into soutchay
add  rails12 gem for heroku
Merge pull request #15 from meidlin/soutchay

Soutchay
removed groups from nav bar