minor tweaks
resolved conflicts to pull master
made it so lochness will move you to a random room. Still need to tweak it a little
lochness room redirect not working quite right yet
added whirlpool method, deleted me_talk_pretty method
able to add font awesome symbols and worked on formatting
Merge pull request #10 from jcward10/testing-weapons

Testing weapons