first homework
Merge pull request #1 from sheltonz/remaster