merge
Merge branch 'master' of https://github.com/blackandcold/Protocols-SS2014-P2
part one good to go