random commit for .DS
Merge branch 'master' of https://github.com/jcsalaza/fill_in_the_flash

Conflicts:
	.DS_Store
Merge branch 'master' of https://github.com/jcsalaza/fill_in_the_flash
let's try this thing
Merge pull request #6 from jcsalaza/finishing_controller

Finishing controller