added js files
Merge remote-tracking branch 'origin/Derek'

Conflicts:
	smart/Gemfile.lock
	smart/app/views/statuses/index.html.erb
	smart/db/schema.rb