Merge pull request #1 from iandees/gh-pages

Add JSON API
adds Siren hypermedia API
10:49 <@iandees> wearing=shorts? wtf is that thayer
use JSON api
Merge branch 'gh-pages' of https://github.com/joshuathayer/isaaronsalmonwearingshorts.com into joshuathayer-gh-pages
fixing up things
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

Conflicts:
	index.html
Use high tech angular.js instead of lame pure JavaScript.

It's only 79KB more JavaScript so it'll be fine.