base files working

much debugging still to be done
added userId

set to random at application launch
Merge branch 'user_id'
Merge branch 'master' of https://github.com/pramodsum/Penning
Merge branch 'master' into base_2

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
	src/edu/umich/penning/MainActivity.java
Merge branch 'Sumedha'
Merge branch 'base_2'
Merge branch 'master' of https://github.com/pramodsum/Penning

Conflicts:
	src/edu/umich/penning/CollabEditTextListener.java
Merge branch 'master' into Sumedha