Added stuff
Merge branch 'master' of https://github.com/thinknovelty/Sidenotes

Conflicts:
	PicrDB/Script.sql