Louis' initial commit; Android setup commences
Merge branch 'master' of github.com:jfmatt/frindr