k
Merge remote-tracking branch 'origin/master'

Conflicts:
	IT 497- Asignment 1-Kaveh Arvand.docx