Tech Predictions page updated
Merge branch 'master' of https://github.com/gtgiola/CS3043_The_Matrix_Group_Project

Conflicts:
	tech_prediction.html