remind myself to not suck at programming

i should kill myself
Merge branch 'master' of https://github.com/rac10/FantomDev

Conflicts:
	fyp_pt1/bin/fan/lib/fan/fyp_pt1.pod