Update my rails notes~
Merge branch 'mac'

Merge mac notes on master again so that everything is up to date~