modified git ignore
added login and registration webservice
merged conflicts
merged conflicts
Merge branch 'master' of https://github.com/abubalanandan/Encourage-Android