Update User Prediction Function
Merge branch 'master' of https://github.com/dswright/example3

Conflicts:
	application/models/Stockspage_model.php
Detect Ticker in Stream
Merge branch 'master' of https://github.com/dswright/example3

Conflicts:
	application/models/Stockspage_model.php