added new file
changed
Merge branch 'master' of https://github.com/inshift/learning

Conflicts:
	index.html