Wat 1.1
Wat 1.1
Wat 2.2
Merge branch 'master' of https://github.com/kronismax/Calculator.git

Conflicts:
	Wat/src/com/example/wat/MainActivity.java
Wat 1.2