dsaf
ignore
d
Merge branch 'master' of
https://github.com/brandonadalesandro/project-milano.git

Conflicts:
	bin/R.txt
	bin/classes/com/codeday/milano/MainActivity.class
	bin/classes/com/codeday/milano/R$id.class
	bin/classes/com/codeday/milano/R$integer.class
	bin/classes/com/codeday/milano/R$layout.class
	bin/classes/com/codeday/milano/R$menu.class
	bin/classes/com/codeday/milano/R$string.class
	bin/classes/com/codeday/milano/R$style.class
	bin/classes/com/codeday/milano/R$styleable.class
	bin/classes/com/codeday/milano/ViewPostActivity.class