Misc. etc;
Merge conflict;
Updated;
Merge branch 'master' of github.com:stefanwoj89/grammar_comrade