Added .gitignore to repo
Merge https://github.com/Danielnguyen91/Android-App
Merge https://github.com/Danielnguyen91/Android-App
change androidmanifest