almost done incorporating everything to our server and database
Merge branch 'master' of https://github.com/SirKylePoland/simplechef