our branch is better! :P
second push
Merge branch 'front_end_practice'
Merge branch 'master' of https://github.com/jcsalaza/fill_in_the_flash

Conflicts:
	practice.rb