Added StaticPage controller / view
Added basic user + fingoal - resolved gemfile conflicts - upgraded to rails 4