merge conflicts
merge
demo version
found the commented out part!
Merge branch 'master' into Elffers-master
adding photo upload on user reset page
trying to get postgres db to work
trying to set aws configs
redirecting
more redirects
adabot works
updating help
problems listed on profile page
things seem to be working
fixes css typo
code formatting changes
add link to helplist app
Merge pull request #7 from kerrizor/update_message

Update message
merge conflicts
fixed merge conflicts, commented out adabot for developing