yesshym
resolved conflict
add micah_NOTES
Merge branch 'master' of github.com:deatheragetr/simple-auth