Linked to aptana
l
Merge branch 'master' of https://github.com/paiva/twitter

Conflicts:
	.gitignore
changed