Changes
Merge branch 'master' of https://github.com/khshah3/cs425-mp4

Conflicts:
	logs/applications.log