added in ocr
Work
new training data
Merge remote-tracking branch 'brad/master'

Conflicts:
	src/com/codefest_jetsons/activity/TicketCreateActivity.java
Work
updating my iml file
adding classes jar
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'brad/master'

Conflicts:
	src/com/codefest_jetsons/activity/TicketCreateActivity.java
Merge remote-tracking branch 'upstream/master'
Work
Merge remote-tracking branch 'origin/master'
sdf
Merge pull request #11 from BradMoeller/master

Work
validation work
Merge branch 'master' of github.com:nick49rt/codefest-jetsons

Conflicts:
	res/layout/ticket_info_activity.xml
	src/com/codefest_jetsons/activity/TicketInfoActivity.java
	src/com/codefest_jetsons/util/ParkingSharedPref.java
validation bug fixes
Merge remote-tracking branch 'abhi/master'

Conflicts:
	src/com/codefest_jetsons/activity/TicketInfoActivity.java
merge bug fix
sdf