deleting duplicate controllers/views
profile picture uploading/viewing on public user page works
built
include aws
hopefully fix
Merge branch 'master' of heroku.com:planitup-backend

force merge
Merge branch 'master' of heroku.com:planitup-backend into timetracking
Public user id with everything, user images working
added icons, changed alert styling
Adding pagination to discussions
Commenting out pagination query
Trying pagination query again
Commenting out pagination in discussions
Adding pagination method back into discussions
Never mind
Adding commented out pagination methods to tasks
Adding commented out pagination methods to updates
Fixing variable names
Uncommenting pagination method in tasks
Recommenting pagination method in tasks