Update .gitignore

Most of these will have to be removed form gitignore... they cause issues for me since windows file paths are different. 
We should set up a constants file that has paths like this and uses one or the other based on the OS. I will look into this
Conquest/AndroidManifest.xml
Conquest/res/layout/activity_map.xml
Conquest/src/conquest/online/MainActivity.java