commiting to pull recent changes
Merge branch 'master' of https://github.com/capellayee/roo
pulling most updated
working out email issue in fbuser