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
Dropbox Auth

work in progress, can't be finished until we get XML parsing ready.
Dropbox Sync

added file checking and sync function
Dropbox Sync 2

added description on how to use the module
Forgot to remove this test file
create landing_page.py

This is the first basic draft of the landing page.
Create user_info_entry.py

Basic user entry fields and a frame to integrate dropbox information.  No code connecting it to local files on the computer at the moment
Merge pull request #16 from cbrobbi/Development

Development
Added placeholder buttons for tabs