made my changes
Merge branch 'master' of https://github.com/davidheryanto/CS3246

Conflicts:
	Project1-Demo/console_output.txt