Committing old changes

Signed-off-by: Christopher Hallahan <challahan@gmail.com>
Merge branch 'master' of https://github.com/challahan/Kent-State-Prototyping