Merge branch 'dev1.1' into beta
Update README.md
Added license
deleted files to make room.
Added all missing files. For some reason I could not merge them in.
Merge branch 'beta' of https://github.com/AdamKyle/Aisis-Framework.git into beta
Merge branch 'beta' of https://github.com/AdamKyle/Aisis-Framework.git
into beta
changes?
Merge branch 'development' into beta
Merge branch 'development' into beta
added files?
added files?
fixed merge issues
Update README.md

Fixed the Layout
merged development into beta
Fixed conflicts
Narrow page Template Added.

Removed newly added short codes, replaced with a template instead. There is a new page template called "Narrow" which allows for narrow page content.
removeed files
aded new files