PA-84 #comments: adding web form
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
compiling completed
Merge branch 'master' of https://github.com/BP2014W1/rapid-prototype into dev
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
smaller fixes
PA-85 #comments: now working
PA-85 #comments: cleaning up
PA-85 #comments: final fix. uploading files now work
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
PA-85 #comments: building a package
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
PA-83 #comments: fixes spelling
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
PA-83 #comments: adding XML sample file
added parser functions
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev

Conflicts:
	JComparser/src/Parser.java
PA-89 #comments: adding sql schema for DB layout
added parser functions