Initial commit
Merge branch 'master' into test_branch

Conflicts:
	README.md
	Adding a comment to play with pull requests more.
Merge pull request #3 from douglasjacobsen/test_pull_request2

Test pull request2