added nav buttons
conflicts
am conflict
merged
android manifest
merge
Merge pull request #23 from 3olcin/master

merge please