login/reg done
Merge branch 'master' of github.com:lmramirez/160Project