Merge pull request #2 from jamcohen/jake

Scheduling
Merge pull request #3 from jamcohen/jake

Added all sorts of scheduling stuff
background and about me
added aboutus
merged conflict
changed css