init commit
added pg gem
I r the beseters
Delete README.rdoc
Added reading from url as a capability of the json parser, added functions for trying to upload file from disk, but on functional.
Still have to address that for next milestone..
Merge branch 'master' of https://github.com/yangas/Parser_app
Deleted some comments that were not needed
comenting out uploader to see if fixes heroku
put back delete checker
Changed edit, so that it doesn't import form
fixed so that just shows input box, and submit button
Centered url field and removed titles above text box
Merge branch 'master' of heroku.com:frozen-refuge-3855

Conflicts:
	Gemfile
	Gemfile.lock
	Rakefile
	app/views/layouts/application.html.erb
	bin/bundle
	bin/rails
	bin/rake
	config/application.rb
	config/environment.rb
	config/environments/development.rb
	config/environments/production.rb
	config/environments/test.rb
	config/initializers/secret_token.rb
	config/initializers/session_store.rb
	config/routes.rb
	db/schema.rb
re-uploading after removing the merged files
added gem and ruby version in gemfile for heroku commits.
changed version showing