lots of stuff
Merge branch 'master' of https://github.com/velazqua/competitive-programming

pulling stuff