Added note model
Merge branch 'master' of https://github.com/janvillarosa/web-echonotes

Conflicts:
	app/models/User.php
	app/views/index.php