This stuff says it needed committed....
Merge branch 'master' of https://github.com/NathanBland/softEng2013

Conflicts:
	app/.idea/workspace.xml
this is a commit
Here's the added Foundation Framework and our pages as they appear thus far.