Merge pull request #7 from nromanen/dkozatc_myBranch

Dkozatc my branch
working over bootstrap
working with boostrap 1
boostrap chanages 2
Merge pull request #9 from nromanen/Shaman

Shaman
Changes views to bootstrap
Merge branch 'dkozatc_myBranch' of https://github.com/nromanen/CH-009 into dkozatc_myBranch
add next
fix button add
json2
2
2
etap rozrobku z vukoristannyam bootstrap
bootstrap work - Materials DONE
fetch units from json. in process
Merge branch 'Shaman' of https://github.com/nromanen/CH-009 into Shaman
merge step 1
s
fixed bugs
fetching json