Sample Commit
Merge remote-tracking branch 'chibz/master'

Conflicts:
	config/routes.rb
Merge pull request #1 from MonsieurSlim/master

Merge Changes