Changed 4 to Ian
change
Merge branch 'master' of https://github.com/sharmainelim/demo1

Conflicts:
	basics/exercise2.txt