Fixing autogenerated controller tests. All tests now pass.
Adding Welcome controller to handle homepage
Adding Admin controller to manage administrative backend
Configuring app to work with Bootstrap via rails_layout
Completing Navbar
Adding dynamic content to frontpage
Merge branch 'master' of /home/bsalter/RubymineProjects/Saltosaurus with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Gemfile.lock
	test/controllers/updates_controller_test.rb
Fixing deleted files
Adding Projects and About controllers to handle new pages
Finishing main welcome page
Fixing migrations...