Merge pull request #4 from fiery-skippers-2014/thisisnew

woooooo