Inital commit (now that I've removed passwords from the code)
change background color of current category
Merge branch 'master' of github.com:cgag/Bookmarking

Conflicts:
	resources/css/mycss.css
	todo