all files
Merge branch 'master' of 207.210.202.221:/var/git/amply

Conflicts:
	.sass-cache/e93b990ecf879df6a7d0a6bb39756b221fe5debf/screen.scssc
	public/css/screen.css
	public/sass/screen.scss
add ip
add ip
fake config file
force change