pay no attention
Merge branch 'master' of https://github.com/kgawne/P2PCalendar
piddly errors
fixed merge errors
Merge branch 'master' of https://github.com/kgawne/P2PCalendar
updated iterative portion
merge conflicts resolved: