changed some of the greeting messages and other text stuff
forgot to add Yac file
fix conflicts
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com