ran a bundle install after pulling
updates gemfile
Merge branch 'master' of github.com:TheNinJedi/home_teaching_app
adds some styling to homepage and adds family controller and views and a link on the navbar to the families page
Merge branch 'master' of github.com:TheNinJedi/home_teaching_app