setting up for FYPComponents to be data-dependent
Converging of two branches, beautiful sight.
Merge branch 'master' of https://github.com/Xrave/CourseSurfer