new stuff

we worked on this together
merge problems
Merge branch 'master' of https://github.com/NateFlynn/ace
Revert "merge problems"

This reverts commit c627893889f4646d9d129fa34701b3c01561d9ce.
Revert "new stuff"

This reverts commit d71bddb184c4ed789af59a9f0d6230e4352ee849.
course

course.php as been created
new stuff

done with nate
Revert "new stuff"

This reverts commit f6018e08d8d38fadc723209d0838ebf1b065c35c.
Merge branch 'master' of https://github.com/NateFlynn/ace

Conflicts:
	s/s.css