Merge pull request #3 from HarrisYip/master

Fix url in animals and add images to deal with it
CRON JOB: Backup DB
added new salt img
no johns
Created basic non-error checking macro script
merge
untested script
removed indent
now indent is removed
Merge pull request #4 from CupofT/master

- Add new salt image
- Add no johns script
fix nojohns, fix description error in salt, and removing troll icon script
Merge pull request #5 from HarrisYip/master

Fix script for urban dictionary
Webserver stub in
merge
backup macros
clean ups
CRON JOB: Backup DB