first commit Dublin Apps
Merge branch 'master' of https://github.com/Q5ULL/wd4-fall2014

Conflicts:
	.DS_Store
test
Merge branch 'master' of https://github.com/Q5ULL/wd4-fall2014

Conflicts:
	.DS_Store