# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: David <david@linuxmint.linuxmint-domain>
#
# On branch master
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   .idea/.generators
#	modified:   .idea/.rakeTasks
#	modified:   .idea/ScrewCharlie.iml
#	modified:   .idea/dataSources.xml
#	modified:   .idea/workspace.xml
#	modified:   Gemfile
#	modified:   Gemfile.lock
#	modified:   app/helpers/game_helper.rb
#	modified:   app/models/board.rb
#	modified:   app/models/card.rb
#	modified:   app/models/deck.rb
#	modified:   app/models/draw_card.rb
#	modified:   app/models/draw_pile.rb
#	modified:   app/models/game.rb
#	modified:   app/models/game_player.rb
#	modified:   app/models/hand.rb
#	modified:   app/models/move.rb
#	modified:   app/models/move_card.rb
#	modified:   app/models/play_card.rb
#	modified:   app/models/player.rb
#	modified:   app/models/player_action.rb
#	modified:   app/models/player_session.rb
#	modified:   app/models/slot.rb
#	modified:   app/models/turn.rb
#	modified:   config/database.yml
#	modified:   config/routes.rb
#	modified:   db/seeds.rb
#	modified:   spec/factories/boards.rb
#	modified:   spec/factories/cards.rb
#	modified:   spec/factories/decks.rb
#	modified:   spec/factories/draw_cards.rb
#	modified:   spec/factories/draw_piles.rb
#	modified:   spec/factories/game_players.rb
#	modified:   spec/factories/games.rb
#	modified:   spec/factories/hands.rb
#	modified:   spec/factories/move_cards.rb
#	modified:   spec/factories/moves.rb
#	modified:   spec/factories/play_cards.rb
#	modified:   spec/factories/player_actions.rb
#	modified:   spec/factories/player_sessions.rb
#	modified:   spec/factories/players.rb
#	modified:   spec/factories/slots.rb
#	modified:   spec/factories/turns.rb
#	modified:   spec/models/board_spec.rb
#	modified:   spec/models/card_spec.rb
#	modified:   spec/models/deck_spec.rb
#	modified:   spec/models/draw_card_spec.rb
#	modified:   spec/models/draw_pile_spec.rb
#	modified:   spec/models/game_player_spec.rb
#	modified:   spec/models/game_spec.rb
#	modified:   spec/models/hand_spec.rb
#	modified:   spec/models/move_card_spec.rb
#	modified:   spec/models/play_card_spec.rb
#	modified:   spec/models/player_action_spec.rb
#	modified:   spec/models/player_session_spec.rb
#	modified:   spec/models/player_spec.rb
#	modified:   spec/models/slot_spec.rb
#	modified:   spec/models/turn_spec.rb
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	.idea/runConfigurations/
#	app/assets/javascripts/deck.js.coffee
#	app/assets/stylesheets/deck.css.scss
#	app/controllers/deck_controller.rb
#	app/helpers/deck_helper.rb
#	app/views/deck/
#	spec/controllers/deck_controller_spec.rb
#	spec/helpers/deck_helper_spec.rb
#	spec/views/deck/
Implement crude authentication mechanism
This will be enhanced going forward
Create login screen
Add Support for devise
Add Support for devise
Add Support for devise
associate user with player
associate user with player
associate user with player
Delete database.yml
associate user with player
Merge remote-tracking branch 'origin/development' into development
associate user with player
associate user with player
Merge branch 'development'

Conflicts:
	.idea/workspace.xml
	config/database.example.yml
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 15 commits.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	deleted:    .idea/.generators
#	deleted:    .idea/.name
#	deleted:    .idea/.rakeTasks
#	deleted:    .idea/ScrewCharlie.iml
#	deleted:    .idea/dataSources.ids
#	deleted:    .idea/dataSources.xml
#	deleted:    .idea/dictionaries/David.xml
#	deleted:    .idea/encodings.xml
#	deleted:    .idea/inspectionProfiles/Project_Default.xml
#	deleted:    .idea/inspectionProfiles/profiles_settings.xml
#	deleted:    .idea/misc.xml
#	deleted:    .idea/modules.xml
#	deleted:    .idea/railways.cache
#	deleted:    .idea/runConfigurations/Development__ScrewCharlie.xml
#	deleted:    .idea/runConfigurations/Production__ScrewCharlie.xml
#	deleted:    .idea/runConfigurations/spec.xml
#	deleted:    .idea/runConfigurations/test.xml
#	deleted:    .idea/scopes/scope_settings.xml
#	deleted:    .idea/vcs.xml
#	deleted:    .idea/workspace.xml
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   .gitignore
#