gistfile1.txt

```
[admin@LenovoUltrabookU530Touch FishingBot]$ git status
On branch master
Your branch is up to date with 'origin/master'.

Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

	new file:   FishingBot.iml
	renamed:    src/Style.css -> resources/css/main-window.css
	renamed:    src/extra.css -> resources/css/option-window.css
	renamed:    resources/gems.png -> resources/images/gems.png
	renamed:    resources/icon.png -> resources/images/icon.png
	renamed:    resources/lollipop.png -> resources/images/lollipop.png
	renamed:    resources/mouse.png -> resources/images/mouse.png
	renamed:    resources/orb.png -> resources/images/orb.png
	renamed:    resources/quest.gif -> resources/images/quest.gif
	renamed:    resources/spyglass.png -> resources/images/spyglass.png
	renamed:    resources/worm.png -> resources/images/worm.png
	deleted:    src/META-INF/MANIFEST.MF
	modified:   src/controller/Controller.java
	new file:   src/controller/Conversation.java
	deleted:    src/controller/MessageListener.java
	new file:   src/exceptions/TimeoutException.java
	renamed:    src/model/Lang.java -> src/localization/Lang.java
	new file:   src/localization/Macros.java
	new file:   src/model/AlarmClock.java
	deleted:    src/model/Angler.java
	new file:   src/model/Listener.java
	modified:   src/model/Lure.java
	modified:   src/model/LureType.java
	new file:   src/model/Point.java
	new file:   src/model/Region.java
	deleted:    src/model/Tools.java
	new file:   src/model/singleton/Angler.java
	new file:   src/model/singleton/Computer.java
	new file:   src/view/LureButton.java

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:   readme.md
	modified:   resources/css/main-window.css
	modified:   resources/css/option-window.css
	modified:   src/controller/Controller.java
	modified:   src/controller/Conversation.java
	modified:   src/controller/Encryption.java
	modified:   src/controller/SaveData.java
	modified:   src/exceptions/TimeoutException.java
	modified:   src/localization/Lang.java
	modified:   src/localization/Macros.java
	modified:   src/model/AlarmClock.java
	modified:   src/model/Listener.java
	modified:   src/model/Lure.java
	modified:   src/model/LureType.java
	modified:   src/model/Point.java
	modified:   src/model/Region.java
	modified:   src/model/singleton/Angler.java
	modified:   src/model/singleton/Computer.java
  modified:   src/view/ExtraOptionWindow.java
	modified:   src/view/GUI.java
	modified:   src/view/LureButton.java
	modified:   src/view/NumberField.java
	modified:   src/view/ObtrusiveWindow.java
	modified:   src/view/SelectionWindow.java
	modified:   src/view/TimePicker.java

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	.idea/
	Animation.gif
	Data for fishingbot.png
	Photoshop CS6_2017-08-01_00-24-06.png
	classes/