test
add all files
add file
add file
New changelist
New changelist
Merge branch 'master' of https://github.com/techlogics/InTheFuture_android

Conflicts:
	.gitignore