so fancy
commitment issues
not feeling very fancy anymore
Merge branch 'angela'

Conflicts:
	README.md
Readme edited#
Merge branch 'ChrisK'

Conflicts:
	README.md
Hello from Angela