phuc
phuc
Merge branch 'master' of github.com:nguyen-tinh-mulodo/AlePlace

# By nguyen-tinh-mulodo
# Via nguyen-tinh-mulodo
* 'master' of github.com:nguyen-tinh-mulodo/AlePlace:
  add header
  upload star.png
  Layout all

Conflicts:
	.DS_Store
	AlePlace.xcodeproj/project.pbxproj