javascript stuff
Merge branch 'master' of github.com:ealtmix/twitter_crawl
message
Merge branch 'master' of github.com:ealtmix/twitter_crawl

Conflicts:
	app/controllers/crawls_controller.rb
fuckkkkkk
Merge branch 'master' of github.com:ealtmix/twitter_crawl