Set up modal for editing items, may need ajax for saving
Merge branch 'master' into alex

Conflicts:
	app/views/profile.blade.php
	app/views/profiles_index.blade.php
Merge pull request #24 from afalsario/alex

Alex committing changes
Merge branch 'master' into anthony

Conflicts:
	app/views/profiles_index.blade.php
	public/img-upload/2_profile.jpg