android manifest
Merge branch 'old' of https://github.com/wraziens/INFO6130 into old