creacion de estructura
cambio de estructura 4
Merge branch 'master' of https://github.com/defelippe/PillReminder.git

Conflicts:
	PillReminder/bin/PillReminder.apk
	PillReminder/bin/resources.ap_
	PillReminder/src/com/tootab/pillreminder/controller/PillsGenerator.java
correcion