Just updating whatever I saved so that we all have the same stuff in case you are working on it in the mean time.
Merge branch 'develop' of https://github.com/guydude1727/ria into develop