New Timeline UI in Note.php, Cards UI in Record.php, Fixed scrolling issues
Merge branch 'master' of https://github.com/janvillarosa/web-echonotes

Conflicts:
	app/views/note.php
Fixed scrolling issues in Homepage
Commit for merging
Fixed merging issue in note.php

- Moved rhett’s php code to get note id in the title. This is temporary!
Merge remote-tracking branch 'origin/master' into Back-End

Conflicts:
	app/views/note.php
New ajax code for uploading record

Now comes with error display :D
Annotations now show up on the recording screen
UI Changes in Record Screen
!!!!!!DATABASE UPDATE!!!!!!!!
Merge remote-tracking branch 'origin/master' into Back-End

Conflicts:
	app/views/note.php