Removed commented out codes
Merge branch 'master' of https://github.com/janvillarosa/web-echonotes

Conflicts:
	app/views/record.php
Commented out Echonote_Tag
Merge remote-tracking branch 'origin/master' into Back-End

Conflicts:
	Database query.sql