haroon first commit
Merge branch 'master' of https://github.com/BilalKat/notesplus

Conflicts:
	functions.php

Signed-off-by: HaroonVankra <thamivankra@gmail.com>