Merge branch 'master' of C:\Users\Andrea\Desktop\DNAmic with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DNAmic/src/com/fama/dnamic/screens/HomeScreen.java
Merge branch 'master' of https://github.com/fama14/DNAmic
Homescreen con tre (brutti) bottoni