Create conflict_test.py

This may not work. But the assumption is that by deleting the if statement, we can create a merge conflict.
Making name change
Fixing conflict
test commit; please ignore
Test commit; Please ignore
Update conflict_test.py
Test Commint; please ignore

no, really
Update conflict_test.py
Update conflict_test.py
Update conflict_test.py
Merge pull request #2 from bjnovak/Test

Update conflict_test.py
Merge branch 'Test' of https://github.com/MSU-CS-Software-Engineering/habitgame
Merge branch 'Development' of https://github.com/MSU-CS-Software-Engineering/habitgame

Retrieving most recent changes in Development Branch
Created installer.py and installer_readme.txt