Initial commit
Initial commit of framework code
Merge branch 'master' of github.com:testflyjets/zapweb
Implements basic login and zap card display
Adds app_id key to yml and adds dev_log
Adds zapcards controller
Merge branch 'master' of github.com:testflyjets/zapweb

Conflicts:
	config/routes.rb
Removes unused coffeescript files
Adds fileName method and link to file
Adds vpim gem for Vcard handling

* adds gem
* adds Contact model for managing contact list
* adds vcard experiment info to dev_log
Adds features to contact to retrieve vCard info

* deletes unused zapcard model
Fixes ZapCard association
Removes extraneous controller
Implements now functional has_many
Updates Gemfile to use local parse_resource
adds resource_class_name to has_many
Fixes merge conflict
Begins implementation with ParseFile
Implements MoreInfo uploads
Implements zap card and more info handling with new ParseFile