:space_invader: Added .gitattributes & .gitignore files
halo mama
final flow
dynamoDB related things - unfinished interface
temporary dynamodb - query
Merge commit '455591624939eb397d1acdac21df8004d9c5080e'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/HaloMama.apk
	bin/classes.dex
	bin/classes/com/nandanu/halomama/Desc1Fragment.class
	bin/classes/com/nandanu/halomama/Desc2Fragment.class
	bin/classes/com/nandanu/halomama/Desc3Fragment$1.class
	bin/classes/com/nandanu/halomama/Desc3Fragment$AccessTokenGet.class
	bin/classes/com/nandanu/halomama/Desc3Fragment$TokenGet$1.class
	bin/classes/com/nandanu/halomama/Desc3Fragment$TokenGet.class
	bin/classes/com/nandanu/halomama/Desc3Fragment.class
	bin/classes/com/nandanu/halomama/DescActivity$SectionsPagerAdapter.class
	bin/classes/com/nandanu/halomama/DescActivity.class
	bin/classes/com/nandanu/halomama/R$id.class
	bin/classes/com/nandanu/halomama/R$layout.class
	bin/classes/com/nandanu/halomama/R$string.class
	bin/classes/com/nandanu/halomama/R$style.class
	bin/classes/com/nandanu/halomama/R$styleable.class
	bin/classes/com/nandanu/halomama/RecordActivity$1.class
	bin/classes/com/nandanu/halomama/RecordActivity.class
	bin/classes/com/nandanu/halomama/UploadActivity.class
	bin/classes/com/nandanu/halomama/model/Constants.class
	bin/resources.ap_
	gen/com/nandanu/halomama/R.java
	res/layout/activity_record.xml
	res/layout/activity_share_twitter.xml
	res/layout/activity_upload.xml
	res/layout/fragment_desc1.xml
	res/layout/fragment_desc2.xml
	res/layout/fragment_desc3.xml
	res/layout/fragment_upload_feeling.xml
	res/layout/fragment_upload_mama.xml
	res/values/strings.xml
	src/com/nandanu/halomama/Desc1Fragment.java
	src/com/nandanu/halomama/Desc2Fragment.java
	src/com/nandanu/halomama/Desc3Fragment.java
	src/com/nandanu/halomama/DescActivity.java
	src/com/nandanu/halomama/RecordActivity.java
	src/com/nandanu/halomama/UploadActivity.java
	src/com/nandanu/halomama/model/Constants.java
fix ddb
Merge branch 'master' of https://github.com/nandawperdana/HaloMama
Merge commit 'eef76d27fc0601ab6be97e12ae1270e2173fbed6'
change twitter app
Merge commit '113ef0a1a75c2974c8313e14318d1f320358f1f9'

Conflicts:
	src/com/nandanu/halomama/model/Constants.java
Merge branch 'master' of https://github.com/nandawperdana/HaloMama

merging code for debug
fixing query object
Merge branch 'master' of https://github.com/nandawperdana/HaloMama

fixing router query dynamodb