Finished 1 april 2013 draft 44 minutes late
Merge branch 'master' of https://github.com/holtzermann17/peeragogy-handbook
Finished 1 april 2013 draft 51 minutes late