All function working
Merge branch 'master' into Nathan_Andrew
fixed merge conflict
Merge pull request #13 from fiery-skippers-2014/Nathan_Andrew

YAY~!!!!!!!