Reverting commits
Updating Readme
Adding bootstwatch
Reverting commits
Updating Readme
Resolving merge
Merge branch 'change_branch'

Conflicts:
	Gemfile.lock