changes to app
merge
changes to app
styled with bootstrap