Trying to add fake data
adding signup
Merging devleop and master
Update with stashed changes
Modified the MainActivity and MyQActivity to put fake data
fixed some merging issue
WoZ NDEF Tagging... intent sent... need to parse.
WoZ NDEF Tagging... intent sent... need to parse.
WoZ NDEF Tagging... intent sent... need to parse.
WoZ NDEF Tagging... intent sent... need to parse.
Added more layout files for the other views (note that they're totally NOT done yet...)
Parsing works. Animated list adapter works. w00t!
Added java files for layouts
?
Merge branch 'refactor_nfc'

* refactor_nfc:
  ?
  Parsing works. Animated list adapter works. w00t!
  WoZ NDEF Tagging... intent sent... need to parse.

Conflicts:
	bin/AndroidManifest.xml
	gen/edu/berkeley/cs160/qUp/R.java
	res/layout/my_q.xml
	res/layout/reservation_search.xml
Added reservation java files
Added menu navigation stuff
Debugging
Reformated a few things
integrations