tab/cal views somewhat implemented; controller code mostly implemented; updated their cucumber tests
Merge branch 'master' of github.com:patrickf3139/bCal-Website