modifed .gitignore
Merge branch 'master' of https://github.com/StyxOfDynamite/aspire-mockup
fixed stuff