first commit
Merge branch 'master' of github.com:AdaRoseEdwards/1am-main

Conflicts:
	README.md