updated my roles
Modified the report to include my changes
Merge branch 'dev' of github.com:vstarostenko/soteria
evie: Project Progress Report 3
submodule changes
evie: bucketed categories
evie: wireframe ideas
Evie: Soteria Logo
Added new wireframes
Merge branch 'dev'
similar attacks file added
Merge branch 'master' of github.com:vstarostenko/soteria

* 'master' of github.com:vstarostenko/soteria:
  Added new wireframes
  created isotope data
  added markdown syntax chagne
  simiilar attcaks
  similar attacks script
  attack similarity
  map reduce working
  started working on map reduce
  modified JSON because Shreyas didnt like the first one :(
  started working on the map reduce chagnes
  added Evie's code, generated JSON
  changes in main notebook
  changes in main notebook
  wiki changes
  obi
  local changes on Victor's
  data folder changes
  More Preprocessing done
  my
Merge branch 'gh-pages' of https://github.com/vstarostenko/soteria into gh-pages
Merge branch 'gh-pages' of https://github.com/vstarostenko/soteria into gh-pages
Merge branch 'gh-pages' of https://github.com/vstarostenko/soteria into gh-pages
Added zoom effect on charts
Made front-end changes