restarts repo with adhearsion framework
Merge branch 'master' of github.com:richeyrobert/varophone

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	README.md
	Rakefile
	config/environment.rb