Added new pages
balili files
Merge branch 'master' of https://github.com/christinebalili/dlab

Conflicts:
	.DS_Store
	application/.DS_Store
	application/views/.DS_Store