changed some of the greeting messages and other text stuff
merging nicks changes
merging changes into dev
changed some of the greeting messages and other text stuff
forgot to add Yac file
pull changes
fix conflicts
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com into dev
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com
Merge branch 'NC-SBL' of https://github.com/NathanTCz/sbl-app.com into dev
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com
Merge branch 'NC-SBL' of https://github.com/NathanTCz/sbl-app.com into dev
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com
pulling changes from NC-SBL
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com into dev
Merge branch 'dev' of https://github.com/NathanTCz/sbl-app.com