Pulled stuff
Typed some more crap
Merge branch 'master' of
https://github.com/r-pankevicius/sgrouphackathon2014.git

Conflicts:
	src/mortals/sharptools/cneq.py