added photos on homepage
added images directory
removed broken image
Merge pull request #24 from joyicecloud/improving-blog

added photos on homepage
added color to the buttonsw
Merge remote-tracking branch 'upstream/source' into colorfulbuttons

Conflicts:
	source/stylesheets/all.css
Merge pull request #25 from jendiamond/colorfulbuttons

added color to the buttons
adding Andres Page
Added the Bundler for Development Cheatsheet
Wrote daily blog log for Monday July 22 2013
Fixed url to day6 instead of day1 and fewer exclamation marks :P
Deleted old file
Fixed to correct date and deleted file
Deleted old file
Merge pull request #28 from jendiamond/bundlerfordevcheatsheet

Added the Bundler for Development Cheatsheet
Merge pull request #27 from joyicecloud/blog-log

Wrote daily blog log for Monday July 22 2013
Changed Day 6 to Day 5 in blog
Merge pull request #29 from joyicecloud/blog-log

Changed Day 6 to Day 5 in blog
blog post week2 day6
blog week 2 day 6