Changes on Windows
Merge branch 'master' of https://github.com/kaustubhb/haskell_learn

Conflicts:
	haskell.docx
	haskell_ubuntu.odt