servr
Merge branch 'master' of https://github.com/halldorel/tyndr-android