Added google api url to javascript tag
Removed javascript api from master
Merge branch 'master' of github.com:apochocolate/viddo
Removed conflicts in application.yml
Merge branch 'master' of github.com:apochocolate/viddo
Updated gemfile, merged youtube branch into master