Updates on server
Updated gitignore
Merge branch 'master' of github.com:BarkerCA/parallax

Conflicts:
	Gemfile.lock