small change will be overwritten
Merge branch 'master' of https://github.com/eugenefilimonov/final_project
add attachement presence validation to photo model. spec included
photo controller edits and tests
use minified swiper file instead
fix validation typo
delete not minified version of swiper.js
more css
resolve conflicts
resolve conflicts
fixed coveralls json
Merge branch 'master' of https://github.com/eugenefilimonov/final_project
Merge pull request #53 from eugenefilimonov/brian_css

Brian css
delayed_job_test
add hirefire gem
bundled
revert to 0cee901b1be469e5ac4edfba6fbfa60d72c5a736
Merge branch 'master' into working_branch

Conflicts:
	coverage/.last_run.json
	coverage/.resultset.json