Merge branch 'master' of https://github.com/dimosarts/2014-autumn-informatics
Merge branch 'master' of https://github.com/dimosarts/2014-autumn-informatics
#137
aaa
#134
#136
#135
#74
#84
Merge branch 'master' of https://github.com/dimosarts/2014-autumn-informatics