merge conflicts
merge conflicts
Merge branch 'master' of github.com:aivanov93/maslab2014
Merge branch 'master' of github.com:aivanov93/maslab2014
Merge branch 'master' of github.com:aivanov93/maslab2014
linearization