Incorporate bootstrap framework
clear conflicts in index