Merge pull request #10 from fuzetsu/gh-pages

Merge gh-pages/master uh ohed
moving angular script to the top again
Merge pull request #12 from fuzetsu/master

merge master into pages again, committed to master by mistake