added sha256
have aes256, but it doesn't work just yet
crypto works!
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/edu/syr/mobileos/encryptednotepad/TestNotes.java