Modify App.java
Merge branch 'floBranch'

Conflicts:
	src/main/java/com/viridian/florsebaproject/App.java