added password strength
cleaned up conflict error
Merge branch 'master' of https://github.com/joellusky/ReminderApp