our branch is better! :P
second push
Merge pull request #1 from jcsalaza/practice

Add practice
Merge branch 'front_end_practice'
Merge branch 'master' of https://github.com/jcsalaza/fill_in_the_flash

Conflicts:
	practice.rb
Delete practice_1.rb
View and controller classes
Merge pull request #3 from jcsalaza/view_branch

View and controller classes
Merge pull request #4 from jcsalaza/model_and_csv

Add movies.csv, songs.csv, decks.rb, cards.rb, parser.rb
testing and tweaking
Merge pull request #5 from jcsalaza/first_test

testing and tweaking
Change made
Merge branch 'master' of https://github.com/jcsalaza/fill_in_the_flash into model_and_csv

Conflicts:
	decks.rb