Initial commit
hello
helloz
Merge branch 'master' of github.com:Harleen91/assignment1

Conflicts:
	README.md