modify alpha1 readme
Merge branch 'develop' of https://github.com/KomodoOpenLab/TypeOver into develop
Merge branch 'develop' of https://github.com/KomodoOpenLab/TypeOver into develop
Merge branch 'develop' of https://github.com/KomodoOpenLab/TypeOver into develop
Merge branch 'develop' of https://github.com/KomodoOpenLab/TypeOver into develop
Merge branch 'develop' of https://github.com/KomodoOpenLab/TypeOver into develop
small modification to function for counting words over the frequency limit in user dictionary
streamline predictHelper in advance of new word mixing algorithm
streamline prediction code to prepare for new mixing algorithm
start of user frequency boost for prediction adaptation
Merge branch 'iss153' of https://github.com/tnantais/TypeOver-1 into iss153
get frequency in position 200 of stock database
move to a percentile instead of a fixed position for choosing user freq offset value
small refactor
add wordinfo struct
build common sorting array using unigram and bigram queries
mixing bigram and unigram frequencies using a weighted average
Merge branch 'develop' of https://github.com/KomodoOpenLab/TypeOver into iss153

Conflicts:
	TypeOver/TypeOver/ViewController.m
Merge pull request #208 from tnantais/iss153

Use weighted average for mixing unigram and bigram probabilities