changes
Merge branch 'dev1.2' into development
changes to the git ignore
Update README.md
Merged dev 1.2.1 into dev1.2
merged and fixed conflict issues
Merge branch 'development' of https://github.com/AdamKyle/Aisis-Framework into development
merged developmet and fixed conflicts