layout missing
Merge branch 'master' of https://github.com/dianaleon/PortfolioFinal

Conflicts:
	res/layout/activity_network.xml