site redesign, implemented bootstrap 3
conclude merge