Merge branch 'master' of C:\Users\Admin\AndroidStudioProjects\cardsofevilintent with conflicts.
Did some stuff.
-JAM