commit before pull
Merge branch 'master' of github.com:veljamatic/bicwp
commit before pull
commit after pull
minor changes
merging conflict solved