commit to update to near final form
commit to fix merge conflict
commit with calendar on calendar page
Merge pull request #48 from talentagentapp/adam

Adam
Merge branch 'master' of github.com:talentagentapp/talent.dev into cory