Signed-off-by: rac10 <rac10@ic.ac.uk>
Merge branch 'master' of https://github.com/rac10/FantomDev.git

Conflicts:
	fyp_pt1/bin/fan/lib/fan/fyp_pt1.pod
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
Merge branch 'master' of https://github.com/rac10/FantomDev

Conflicts:
	.metadata/.plugins/com.xored.fanide.core/compiler/fyp_pt1/fyp_pt1.pod
	fyp_pt1/fan/Data.fan
Merge branch 'master' of https://github.com/rac10/FantomDev
Merge branch 'master' of https://github.com/rac10/FantomDev
Merge branch 'master' of https://github.com/rac10/FantomDev
Merge branch 'master' of https://github.com/rac10/FantomDev
Merge branch 'master' of https://github.com/rac10/FantomDev

Conflicts:
Merge branch 'master' of https://github.com/rac10/FantomDev

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