Test2
Merge pull request #2 from mcnelson/test2

Test2
Merge branch 'master' into test3

Conflicts:
	Gemfile