welcome test
Merge branch 'master' of https://github.com/SpraggleRock/project_genesis into initial_tests

missed button functionality
file naming, game controller spec
gitignore .DS_store
Test: there's a start game button
filename fix and db.schema
Merge pull request #8 from SpraggleRock/file_name_fix

File name fix
Merge branch 'master' into initial_tests

merging initial tests
Merge branch 'master' of https://github.com/SpraggleRock/project_genesis

merging initial tests into master
fixing errors caused by merging old branch
Merge pull request #10 from SpraggleRock/MASTER_FIX

fixing errors caused by merging old branch
removed artifacts of older file structure. With fire.
update branch to reflect changes to master