init-aaron
Merge branch 'master' of https://github.com/bobpaterno/square-peg
Merge branch 'master' of https://github.com/bobpaterno/square-peg
register/login functioning
merged in login branch, login-register work