google calender now embedded
Merge branch 'master' of http://github.com/mtrom/penniaa
don't worry about it
merge stuff