Merge pull request #1 from sulfo/master

Card update
Git is fucking dumb
Merge pull request #4 from Arceopteryx/master

Changed main architecture