add twitter bootstrap
pull from github
change gitignore
merge gitignore