Add hgignore
Merge branch 'master' of git://github.com/afein/pps-ex2
merged from @mariaral and @afein
Merge remote-tracking branch 'afein/master'
stfu @afein
mergesort woohoo