testing to make faster, non success
Merge branch 'master' of https://github.com/golden3point14/SpaceX14

Conflicts:
	assets/js/search.js
Merge branch 'master' of https://github.com/golden3point14/SpaceX14
Merge branch 'master' of https://github.com/golden3point14/SpaceX14

Conflicts:
	assets/js/search.js
main page displays top 10 preempted