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
added -test to DBNAME
Merge branch 'routes'
added profile edit page and routes functionality
show profile functionality
merged in login branch, login-register work
Merge branch 'show-profile'
merged show-profile
matches
switched login to a POST
messages done
matches route and jade basics working
Merge branch 'tdd-message-fix'
Merge branch 'login'
merged profile-edit
edit profile form name changed from primaryPhoto to photo
fixed user.json syntax, valid ipAddress check, deleted extra lookup in route