Broken code. Trying to get the architecture stuff to work, but there are some weird errors.
Syntax fix
Rob did this.
-Removing unused views
-putting stuff from navigation.scala.html into main because navigation never changes it is displayed in any page
Forgot to remove reference to navigation.scala.html in intro
Bring back navigation view because stylesheet was breaking due to the order that html is presented in
Merge remote-tracking branch 'origin/master' into unstable

Conflicts:
	.gitignore
	app/controllers/Application.java
	app/models/architecture.xml
	app/views/intro.scala.html
	app/views/navigation.scala.html
	conf/routes
ignore orig files
-remove white bg color on content
-add more space to top and bottom padding of each tab
-teal highlight on hover
-Menu is just right below header
-Content is displayed on white box now
Merge remote-tracking branch 'origin/master' into unstable
Merge remote-tracking branch 'origin/master' into unstable
Remove padding for header to balance the play logo
New resized play logo
Just moving list items to the left a little bit
Changing the html template used to render architecture and the image link in the xml.
Merge branch 'unstable' of https://csil-git1.cs.surrey.sfu.ca/jvelasco/tech-evaluation into unstable
fixed logo on main page
Merge remote-tracking branch 'origin/cssBranch' into unstable
Images now display correctly