adding details about catupult
not working
stuff
added bootstrap 3
bootstrap complete
fixed conflicts