start commit
new 2 files
lol
Merge origin/master

Conflicts:
	src/flicr/FileToUpload.java
Delete NewClass.java
Delete JavaFXApplication1.java
new 2 files
new 2 files
Merge branch 'master' of https://github.com/xoid/flicr.git
new 2 files
new 2 files
new 2 files
Merge branch 'master' of https://github.com/xoid/flicr.git into local
new 2 files
logs
logs
logs
logs
Merge pull request #1 from xoid/local

Local