Fixed Nick's shit
Merge branch 'NICKBRANCH' of https://github.com/Keegomyneego/dubhacks-prep-2 into NICKBRANCH

Conflicts:
	NicksFile

Fixed conflict, much cleaner now : )