Completed API and added Bootstrap
Merge branch 'apiandbootstrap'