Merge branch 'master' into gh-pages
nevermindnevermindnevermindnevermindnevermindnevermindnevermindnevermindnevermind
Merge branch 'gh-pages'
fixed bug