Merge pull request #22 from brobinson09/master

Merge pull request #5 from emrickgarrett/master
Merge pull request #23 from brobinson09/master

Conflict Killer
Conflict Resolved
Conflict Resolved
Merge pull request #6 from emrickgarrett/master

Merge