reseting branch heirarchy to upstream
fixing branch heirarchy
updated libraries. fixed my 32/64 bit error on windows
change heirarchy
Merge pull request #8 from benwaffle/heirarchy

Hierarchy refactoring