first commit
added a lot of features
Merge branch 'master' of github.com:ohjimijimijimi/aa_project

* 'master' of github.com:ohjimijimijimi/aa_project:
  Initial commit