added proposal
android
clearing
Merge branch 'master' of https://github.com/kalbfled/comp120-final
trying to do key generation
Merge branch 'master' of https://github.com/kalbfled/comp120-final
audio recording and playback
Added some classes for use with RabbitMQ.
Merge branch 'master' of github.com:kalbfled/comp120-final

Conflicts:
	src/edu/tufts/DDP_encrypted_voice/SendMessageActivity.java
Merge branch 'master' of github.com:kalbfled/comp120-final