Adding a Model class to the project
Merge branch 'master' of https://github.com/LuisGit/phaseit

Conflicts:
	androidVersion/AndroidManifest.xml
	androidVersion/src/com/luis/phraseit/Main.java