Moved folders

Switched from MAMP to Mac-installed Apache on my local machine :)
:/
Updated favicons
Merge branch 'beta'