Added whole bunch of stuff

finished 3 functionalities
Merge remote-tracking branch 'origin/master'

Conflicts:
	library.php
	main.php