Removes the bootstrap.css replacement
add Warsaw guide to the curriculum
change Warsaw app tutorial
Merge pull request #210 from FloorD/master

Add Warsaw app tutorial
index: minor typo in diary app link
diary app: it was all @tomash’s idea, I was just a mere writing tool
diary app: explain what Class#method syntax means in practice
Merge pull request #211 from railsgirls/diary-app-entries-controller-rewording

Diary app: link, credits and better wording
Merge pull request #203 from jasinai/master

Removes the bootstrap.css replacement
for bootstrap 3.
confirm ダイアログを表示できるようにする
Merge pull request #212 from kansaichris/master

confirm ダイアログを表示できるようにする Fix to display confirmation dialog when deleting ideas
Merge branch 'upstream'

Conflicts:
	index.html