add #15 fix #16 #17
info
Resolving conflicts, reverting tabs in css, version is still 3.0
Merge branch 'kallosz-master'