Merge pull request #1 from jcalvinowens/Dev

Dev
Merge pull request #3 from jcalvinowens/Dev

Dev
Test
no message
Merge commit '7bce070d40'
Get design document from Dev branch
created folder for documents
Iterations 1 Features document
Update iteration 1 features
Merge branch 'master' into Dev
Delete files from cupcake project
Add javascript libraries for encryption
Implmenent toy cipher for iteration 1 implementation
added createConversation.php
added loadConversation.php
Add "basic-chat" framework for iteration 1
Merge branch 'master' of github.com:jcalvinowens/keychat
CSS tweaks
Organize source tree more nicely
Delete defunct CSS file