updates
Merge branch 'gh-pages' of https://github.com/thebobak/withlove into gh-pages

Conflicts:
	2014-05-16 - Notes.md