TeamAwesome5u/Pacman — pull request #19 by CorruptingAcid (2014-08-20 16:24:42+00:00)
Title: Trying to update everything and ensure we are all on the same sheet

final merger to update all branches