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
Merge pull request #6 from richardszeto/create_event

Create Event, Event Info, Splash Screen changes
Merge pull request #7 from richardszeto/create_event

Changed event code text color to black
Merge pull request #8 from richardszeto/create_event

Minor changes to large text boxes
Merge pull request #9 from richardszeto/create_event

Can now get images from cloud
Merge pull request #10 from richardszeto/create_event

Images now load from cloud
Removed dummy intent from MainActivity's onCreate.
Added ShowcaseView to HomeScreen.
Merge remote-tracking branch 'upstream/master'
fixed conflicts

Conflicts:
	DeployApp/src/com/kidgeniusdesigns/deployapp/HomeScreen.java