before pull
Merge branch 'master' of github.com:chioshinu/praxis
after pull
final fixes
Merge branch 'master' of github.com:chioshinu/praxis