ignoring stuff
Removing local api.js as it's now being fetched from github directly
Merge remote-tracking branch 'origin/master'