from ubuntu changes
Merge branch 'master' of https://github.com/nexron171/newapp

Conflicts:
	config/nginx.conf
pull
nginx.conf
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
unicorn
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp
Merge branch 'master' of https://github.com/nexron171/newapp

Conflicts:
	public/assets/Home-95c1444f75af1817e681a78b9f414c27.png
	public/assets/glyphicons-halflings-d83dfe9df6cd3f50b5ae69abe919e065.png
	public/assets/glyphicons-halflings-white-e06c893995f68ff48aa1b2e591f27889.png
Merge branch 'master' of https://github.com/nexron171/newapp
commit