Merge pull request #2 from berna228/master

Merge from Yaro
Create .gitignore
Delete merge data
Refactored
gitignore
Added Working slider and buttons to CoreListActivity and
activity_core_list.
Fixes to .gitignore and new icon

Updated .gitignore to the proper syntax (Spark had it wrong, I blame
them)
Added new icon for now.
Removed Sliders 2 and 3 
Added a test button and edit text field
Slider sends rainbow on set color press
Testers cleared up for Demo
Added R.java/txt to gitignore; memory save to ApiFacade
Merge branch 'master' into Yaro

Conflicts:
	.gitignore