working on transitioning from php to erb
transitioning to serving with sinatra
Merge remote-tracking branch 'salij/master' into merging
register/login form stuff