Merge pull request #6 from HypnoticSheep/master

Fixed Merge Issues
Merge pull request #7 from HypnoticSheep/master

Minor Changes
Merge pull request #1 from tcsorcs/master

yay
Merge pull request #8 from mdkiemle/master

Merge pull request #1 from tcsorcs/master
Merge pull request #3 from tcsorcs/master

Updating 12/2/14