New Flat cards improved
nothing
login changed
Merge branch 'master' of https://github.com/gweodoo/mpp_project

Conflicts:
	Mpp_Project/src/dk/aau/mpp_project/activity/LogInActivity.java
Merge branch 'master' of https://github.com/gweodoo/mpp_project