Added the CKEditor JS library.
Added the empty_page module.
Adding the custom modules folder and the namu_site module.
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.
Fixed problems in the file resulting from a previous merge conflict.