Dying ember
Merge pull request #3 from githubstudent/master

Please accept my new line