update
updated bootstrap
deleted applcation.css
conflicts resolved