Removed Rails 4 files
Initialized with rails new ./
Added .ruby-version
Restored original landing page
testing gemfile.lock
Removed static ruby version from travis.yml

Travis will default to the version specified in .ruby-version
Revert "Removed static ruby version from travis.yml"

This reverts commit e8a86ef6e366d8a173409a7e1ba5a5207d55fffc.
Switched to haml
created basic homepage
Merge branch 'master' into feature/front-end

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/application.css
	app/controllers/application_controller.rb
	app/views/application/application.html.erb
	config/routes.rb
Merge pull request #6 from codeRIT/feature/front-end

Adding New Home Page