Installing custom modules folder and namu_site module.
Adding the theme and ignoring the SASS folders.
Theming.
Added the Twitter placeholder block.
Updated the body background and added icon images.
Miscellaneous theme updates.
Deleted the templates after moving them into a subdirectory.
Resolving the conflict.