ij works
git 1.8.3
finished logging
Merge branch 'feature' into dev