Updated Start Activity
Updated gitignore, merged