Initial Commit
Merge branch 'master' of github.com:codeblooded/FacultyRepublic

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb
	config/routes.rb