okay git behave

minor confusion using git.. :P
Merge branch 'master' of https://github.com/joshholla/webTechLearning

Conflicts:
	README.MD