Breaking two thing at a time
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/ca/currybox/daru/info.java
I broke dis ting here brah
I broke dis ting here brah