g pages
merge
merge
Merge branch 'master' into gh-pages

Conflicts:
	index.html
Merge branch 'gh-pages' of https://github.com/andreqi/scoreboard-sort into gh-pages
Merge branch 'gh-pages' of https://github.com/andreqi/scoreboard-sort into gh-pages
Merge branch 'gh-pages' of https://github.com/andreqi/scoreboard-sort into gh-pages
Merge branch 'gh-pages' of https://github.com/andreqi/scoreboard-sort into gh-pages
file directory reorder

- assets/javascript -> all js files
- assets/css -> css
- assets/data -> static file that will be parsed
- scripts/ -> helpers