Merge branch 'master' into rissa
Merge branch 'master' into rissa
Merge pull request #45 from TAwesome/Jacob

Jacob
Added flags
Changes with flags
fixed the layout! don't break it!!! lol
Merge pull request #46 from TAwesome/rissa

Rissa
Merge pull request #47 from TAwesome/Jacob

fixed composer.json
Composer.lock updated