first commit
testing

Merge branch 'master' of https://github.com/mjhend/my_proj

Conflicts:
	README.md
trying to make this work
testing

Merge branch 'master' of https://github.com/mjhend/my_proj

Conflicts:
	README.md