fix association and seed development database
Merge branch 'master' of https://github.com/ospreys-2014/GameOverflow
Merge branch 'master' of https://github.com/ospreys-2014/GameOverflow
add nav bootstrap
add root route
add welcome controller and views
update logo in nav
emergence bootstrap
add edit for article
Merge pull request #14 from ospreys-2014/boot-strap-aj-xiran

Boot strap aj xiran