ACCEPT OR BE MURDERED VIOLENTLY#1

Open

DavidFiumano wants to merge 5 commits intoDavidFiumano:masterfrom

Ahmad-Bamba:master

Commits on Dec 24, 2014

This is Sparta- I mean, complete (?)
Ahmad-Bamba
committed

Commits on Dec 28, 2014

Linker errors? I don't even
Ahmad-Bamba
committed

Commits on Dec 29, 2014

THIS COMPILES, SO THAT MEANS IT WORKS YAY
Ahmad-Bamba
committed

Commits on Jan 6, 2015