Merge branch 'dev' of...

.gitignore

.idea/.gitignore

.idea/compiler.xml

.idea/encodings.xml

.idea/misc.xml

.idea/vcs.xml

ImageApplication.iml

src/main/java/NTNU/IDATT1002/App.java

src/main/java/NTNU/IDATT1002/LoggedIn.java

src/main/java/NTNU/IDATT1002/PrimaryController.java

src/main/java/NTNU/IDATT1002/SecondaryController.java

src/main/resources/Images/party.jpg

src/main/resources/NTNU/IDATT1002/logged-in.fxml

src/main/resources/NTNU/IDATT1002/login.fxml

src/main/resources/NTNU/IDATT1002/primary.fxml

src/main/resources/NTNU/IDATT1002/secondary.fxml

src/main/resources/NTNU/IDATT1002/signup.fxml

target/classes/NTNU/IDATT1002/App.class

target/classes/NTNU/IDATT1002/PrimaryController.class

target/classes/NTNU/IDATT1002/SecondaryController.class