a bunch of shit
Merge branch 'master' of https://github.com/kimminahm/BIT4444

Conflicts:
	ToDo.txt
Merge remote-tracking branch 'origin/master'

Conflicts:
	ToDo.txt
omg die