adding tasks
adding tasks
everything functional but not pretty
Merge branch 'master' of https://github.com/madisonmay/FlamingOctopus

Conflicts:
	.idea/misc.xml
	FlamingOctopus/src/main/java/com/mobproto/flamingoctopus/MainActivity.java