Reorganized initial site and began work on fullsite
Almost completed fullsite
Merge branch 'master' of https://github.com/FriendlyDesignCo/gradea

Conflicts:
	contactEmail.php
	css/bootstrap-responsive.css
	css/bootstrap-responsive.min.css
	css/bootstrap.css
	css/bootstrap.min.css
	css/main.css
	fullsite-current/css/flexslider.css
	fullsite-current/css/navstyles.css
	fullsite-current/img/4.jpg
	fullsite-current/img/bg_direction_nav.png
	fullsite-current/img/nav-icon.png
	fullsite-current/js/jquery.flexslider.js
	fullsite-current/js/jquery.mobile-menu.js
	fullsite-current/js/script.min.js
	img/4.jpg
	img/r1-img/1.jpg
	img/r1-img/2.jpg
	img/r1-img/3.jpg
	img/r1-img/4.jpg
	index.html
	initial-placeholder/contactEmail.php
	initial-placeholder/css/bootstrap-responsive.css
	initial-placeholder/css/bootstrap-responsive.min.css
	initial-placeholder/css/bootstrap.css
	initial-placeholder/css/bootstrap.min.css
	initial-placeholder/css/main.css
	initial-placeholder/img/4.jpg
	initial-placeholder/img/r1-img/1.jpg
	initial-placeholder/img/r1-img/2.jpg
	initial-placeholder/img/r1-img/3.jpg
	initial-placeholder/img/r1-img/4.jpg
	initial-placeholder/index.html
	initial-placeholder/js/actions.js
	initial-placeholder/js/bootstrap.js
	initial-placeholder/js/bootstrap.min.js
	initial-placeholder/js/jquery.js
	initial/contactEmail.php
	initial/css/bootstrap-responsive.css
	initial/css/bootstrap-responsive.min.css
	initial/css/bootstrap.css
	initial/css/bootstrap.min.css
	initial/css/main.css
	initial/img/.DS_Store
	initial/img/4.jpg
	initial/img/r1-img/1.jpg
	initial/img/r1-img/2.jpg
	initial/img/r1-img/3.jpg
	initial/img/r1-img/4.jpg
	initial/index.html
	initial/js/.DS_Store
	initial/js/actions.js
	initial/js/bootstrap.js
	initial/js/bootstrap.min.js
	initial/js/jquery.js
	js/actions.js
	js/bootstrap.js
	js/bootstrap.min.js
	js/jquery.js