finished for the day
Merge branch 'master' of https://github.com/Whitepatrick/bookmarks

Conflicts:
	ideas
Merge branch 'master' of https://github.com/Whitepatrick/bookmarks
Merge branch 'master' of https://github.com/Whitepatrick/bookmarks
Merge branch 'master' of https://github.com/Whitepatrick/bookmarks
added more to-do