This new feature is going to rock
Merge branch 'master' into newfeature

Conflicts:
	day3.rb
Example homework
Merge branch 'newfeature'
Merge branch 'master' of https://github.com/thanh8604/Day-3