myles changes

not sure why i commit
Merge branch 'master' of https://github.com/ifsweb/ifsweb-template-default

Conflicts:
	3.0/.DS_Store