initial changes
Merge branch 'master' of github.com:maltic/AIASProject