edit db config for deployment
test heroku
bower on heroku
edit db config for deployment
test heroku
edit db config for deployment
test heroku
edit db config for deployment
test heroku
edit db config for deployment
edit db config for deployment
test heroku
edit db config for deployment
test heroku
edit db config for deployment
test heroku
edit db config for deployment
test heroku
fixed merge
change server