added Gemfile.lock
Fixed merge conflict
Added tray, tiles partial, and notes for the instance variables in the controller
Merge branch 'master' into Styling-Tile
Merge pull request #11 from rongierlach/Styling-Tile

Styling tile