start using .gitignore
start using .gitignore
start using .gitignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/bharv410/Deploy
Allow image uploading and downloading from cloud
reformated programming style
Merge remote-tracking branch 'upstream/master'
fixed conflicts

Conflicts:
	DeployApp/src/com/kidgeniusdesigns/deployapp/HomeScreen.java
Merge pull request #12 from richardszeto/create_event

Allow image uploading and downloading from cloud