master branch finally merged with everyone's changes.

DON'T COMMIT TO MASTER UNTIL YOU'RE SURE YOU'RE READY. Let's keep it the
production branch.
Deadline approaching!
asd
merged with master