added a .gitignore file
made background black
Merge branch 'Main_Interface' of https://github.com/trylon/UBR-1-App.git into Main_Interface
Changed background to gray.
note
Made a change
Made it Purple
Changed background text
Initial interface build by Tim and Z
A little button debugging.
fixed android manifest.xml package name
Updated .gitignore to ignore gen folder
attempt 2 .gitignore
stop tracking R file
Removed bad R file imports from MainActivity. The imports were looking
for R files in the package com.example.myfirstapp. Deleted the import
statements from MainActivity.
Stubbed the click and onResume event handlers; should be ready for merge
with Connection and Dashboard Activities
Merge branch 'Main_Interface'

Conflicts:
	UBRApp/AndroidManifest.xml
	UBRApp/bin/AndroidManifest.xml
	UBRApp/bin/UBRApp.apk
	UBRApp/bin/classes.dex
	UBRApp/bin/resources.ap_
	UBRApp/gen/edu/hartford/ubr1app/R.java
	UBRApp/res/layout/activity_main.xml
	UBRApp/res/values/strings.xml
	UBRApp/src/edu/hartford/ubr1app/MainActivity.java