cleaned up and ready to roll
Merge branch 'chris_branch' of github.com:rcabral90/classcrawler into chris_branch

merging again?!? stupid tip is behind..