password storage complete
Merge branch 'master' of https://github.com/FutureSchool/put_something

Conflicts:
	SMS Delay Sender/src/com/example/sms/delay/sender/Alarm.java
	SMS Delay Sender/src/com/example/sms/delay/sender/Settings.java