got rid of codeigniter, added bootstrap css and js
Merge remote-tracking branch 'origin/dev'