redo resume, add bootstrap 3
merge bootstrap changes