Working main logic

The main logic works!
Merge branch 'master' of https://github.com/bizzk3t/cisc310Projects

Conflicts:
	assign1/main.c