Wont let me pull cause i need to syn
Merge branch 'master' of https://github.com/chuckhousley/rico

Conflicts:
	rico.cpp
A push for the sake of pushing, BTW I call dibs on the master branch, you can have the Pearson one :)