committing to branch
Merge branch 'asheikh0504'

Conflicts:
	report.log
	report.pdf
	report.synctex