pushed stuff up
Merge branch 'master' of github.com:OccupyWallStreet/occupychristie