small changes
fixed merge conflict
more source from home
Merge branch 'master' of github.com:TheAlbatross279/thesis