working on edit/delete links for notes
merge
photo upload semi working
added route/link for editing user name and bio
routes working correctly
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru
Merge pull request #53 from Noahhh/master

Routing working for editing user and bio
Merge branch 'master' of https://github.com/Ramblethru/Ramblethru

Conflicts:
	app/views/.DS_Store
	app/views/notes/create.js.erb