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

Conflicts:
	deleteNote.php
	editNote.php
	form.css
	header.php
	index.php
	login.php
	note.php
	reg.php
	showNotes.php
	style.css
	viewNote.php
sahl
sahal