added settings.jar for Android Studio
removed unused aliases in bashrc
resolved conflict in bashrc
deleted private files