Merge branch 'master' of D:\Programming\AOOP\ProjectAOOP\SmartContact\SmartContact with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/pieronex/smartcontact/MainActivity.java
Merge remote-tracking branch 'origin/master'
setting page with back and forth ability