Added a few components.
Added more components, attempted to add newlines (Eclipse may be deleting ending newlines?)
Add newline at the end.
Merge branch 'Component_Creation'
Removed some weird indent formatting.
Merge branch 'Entity_Creation'