merging, finished displaying timetable on profile.
Merge branch 'master' of github.com:joelbrady/unswfingr