files
Merge branch 'master' of https://github.com/eisha93/cse6140project

Conflicts:
	fake
	output.sh