Delete README.md
Merge branch 'master' of https://github.com/jesse123green/playlistGenerator
scripts added
ds file
Add data and modify song selection query
added gae site
add rdio streamer and generator
auto-populate text fields and generate continuously
weighted model update
update readme for analysis
improvements to choosing a song
playlist db update and pivot analysis
user research app uploaded
labor day prototype updates
Merge branch 'master' of https://github.com/jesse123green/playlistGenerator

Conflicts:
	README
	data/new_users.json
	data/users.json
	scripts/.DS_Store
	scripts/analysis/echonest_songs/track_map.py
	scripts/analysis/word_count.py
	scripts/models/nn_coef/octave_scripts/load_data.m
	scripts/models/nn_coef/octave_scripts/octave-workspace
	scripts/models/nn_coef/octave_scripts/predict_next_word.m
	scripts/models/nn_coef/octave_scripts/train.m
	scripts/models/nn_coef/python_scripts/generate_train_data_tfidf.py
	scripts/models/nn_coef/python_scripts/matlab_to_numpy_file.py
	scripts/models/nn_coef/python_scripts/model_weights.p
	scripts/models/nn_coef/python_scripts/train_tag_distribution.py
	scripts/models/nn_coef/site_files/pgmodel.py
	site/playlist-generator/.DS_Store
	site/playlist-generator/app.yaml
	site/playlist-generator/handlers.py
	site/playlist-generator/handlers.pyc
	site/playlist-generator/main.py
	site/playlist-generator/main.pyc
	site/playlist-generator/static/.DS_Store
	site/playlist-generator/static/js/.DS_Store
	site/playlist-generator/static/js/hello.js
	site/playlist-generator/templates/index.html