Zip code
Merge remote-tracking branch 'upstream/master'
blah
Encryption stuff
Revert "Encryption stuff"

This reverts commit 07da3b305a1296a7a9c950c1561cca0565ee1c5a.
Revert "blah"

This reverts commit dd99dac3e08acc6f4a8fbc178ffbd984ffef8f35.
Merge pull request #153 from daverboy23/master

Encryption stuff
Sign up stuff
Added difference between Admin user log in and regular organizer log in.
Merge pull request #155 from KettyLezama/master

Admin Vs. Organizer View
Merge pull request #154 from sadasilva/master

Sign up stuff
Encryption stuff
Merge pull request #156 from daverboy23/master

Encryption stuff
Encryption
Merge pull request #157 from daverboy23/master

encryption
Signup edits
Merge pull request #158 from sadasilva/master

More sign up
Encryption
Merge pull request #159 from daverboy23/master

encryption
Added new functionality to ROOTKEY to allow for RSA key pair storage. Also added a test file to remove all data from the database -MM