Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
ironed out changes due to merge conflicts being craaaazy
fixed error causing note search page not to load
Merge pull request #140 from Noahhh/master

Fixed some errors in user show page and note search page
added sort to user note show so they won't move places when updated
Merge pull request #141 from Noahhh/master

added sort to user note show so they won't move places when updated
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru