Merge remote-tracking branch 'remotes/origin/1.0.0' into brandon-gitignore

Conflicts:
	README.md
Merge remote-tracking branch 'remotes/origin/1.0.0' into brandon-new-project12
Merge pull request #13 from ArcBees/brandon-new-project12

Brandon new project12