Added main activity
Go to artiora website
added mainactivity java class (was ignored by gitIgnore WOOPS)
gitignore
open language choice activity on settings click
merged with mainPage + fix merge errors
fix on extend and wrong classname
mainactivity ...
Merge remote-tracking branch 'origin/dev' into lang