fdsa
Merge branch 'master' of https://github.com/Nepetalactone/AvalancheWarning

Conflicts:
	AvalancheWarning/src/fh/itb/avalanchewarning/MainActivity.java
testitest

Signed-off-by: Nepetalactone <tobias.meusburger@students.fhv.at>