building up framework
testcommit
minor changes
framework
merged
more framework
footer and header
Merge branch 'master' of https://github.com/mohseno/ProjectX into framework