Starting a javascript curriculum, you guys!!
insert
Merge pull request #211 from railsbridge/js-tutorial

Starting a javascript curriculum, you guys!!
Changed files to show whether the page dealt with hello.html or index.html
Add a note to teaching tips to be well rested the day of teaching.
Rewrite site index spec to care a little less about the current available sites
Add tip that welcome page will not show if using Rails 4.0.x.

Some students using Rails 4.0.x were confused about why the Welcome page showed on their localhost, but not when they pushed to Heroku.
Merge branch 'master' of https://github.com/NatashaHull/docs into NatashaHull-master
Add a note to teaching tips to be well rested the day of teaching. [ci skip]
Merge branch 'alamoz' of https://github.com/Alamoz/docs into Alamoz-alamoz
Reword tip that I just added about the default welcome page not showing on Heroku if using Rails 4.
removed superfluous 'feel'
Merge branch 'master' of https://github.com/SamSamskies/docs into SamSamskies-master
Merge pull request #225 from Alamoz/alamoz

Add a note to teaching tips to be well rested the day of teaching.
Merge pull request #228 from imurchie/master

removed superfluous 'feel'
fixed typo. [ci-skip]
Merge pull request #229 from tracyleeweiss/typo

fixed typo. [ci-skip]
added javascript_not_java.step, linked to it from javascript.step
fix typos in more_teacher_training.deck; add link to BT git ref
modified historical info and added sample code