WORKING DATABASE YAYAYAYAYAYAY
huh?
Merge branch 'master' of https://github.com/Morlackless/Smoke-B-Gone

Conflicts:
	gen/com/goodhearted/smokebegone/R.java
Merge branch 'master' of https://github.com/Morlackless/Smoke-B-Gone